.idea/misc.xml

@@ -37,7 +37,7 @@

                     <ConfirmationsSetting value="0" id="Add" />
              

                     <ConfirmationsSetting value="0" id="Remove" />
              

                   </component>
              

                -  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
              

                +  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
              

                     <output url="file://$PROJECT_DIR$/build/classes" />
              

                   </component>
              

                   <component name="ProjectType">
              

app/build.gradle

@@ -23,6 +23,7 @@ android {

                         versionCode 1030
              

                         versionName "1.0.30"
              

                         buildConfigField "boolean", "isTestMode", "true"
              

                +        buildConfigField "boolean", "isJumpLogin", "false"
              

                         manifestPlaceholders = [CHANNEL_NAME: "guanwang"]
              

                     }
              

                 
              
@@ -60,7 +61,8 @@ android {

                             zipAlignEnabled false
              

                             minifyEnabled false
              

                             shrinkResources false
              

                -            buildConfigField "boolean", "isTestMode", "true"
              

                +            buildConfigField "boolean", "isTestMode", "false"
              

                +            buildConfigField "boolean", "isJumpLogin", "true"
              

                             signingConfig signingConfigs.releaseConfig
              

                         }
              

                     }
              

app/src/main/java/ai/pai/lensman/db/Preferences.java

@@ -4,6 +4,7 @@ import android.content.Context;

                 import android.content.SharedPreferences;
              

                 
              

                 import ai.pai.lensman.App;
              

                +import ai.pai.lensman.BuildConfig;
              

                 
              

                 public class Preferences {
              

                 
              
@@ -45,7 +46,7 @@ public class Preferences {

                     }
              

                 
              

                     public String getLensManId(){
              

                -        return mPrefs.getString("lensManId",NullStr);
              

                +        return mPrefs.getString("lensManId",BuildConfig.isJumpLogin?"Cwi7HSh":NullStr);
              

                     }
              

                 
              

                     public String getWXCode(){
              
@@ -63,14 +64,6 @@ public class Preferences {

                     public void setCameraLibExist(boolean CameraLibExist){
              

                         mPrefs.edit().putBoolean("CameraLibExist",CameraLibExist).commit();
              

                     }
              

                -    public String getCurrentSession(){
              

                -        return mPrefs.getString("currentSession", NullStr);
              

                -    }
              

                -
              

                -    public void setCurrentSession(String currentSession){
              

                -        mPrefs.edit().putString("currentSession",currentSession).commit();
              

                -    }
              

                -
              

                 
              

                     public void setPatchUrl(String patchUrl){
              

                         mPrefs.edit().putString("patchUrl",patchUrl).commit();
              

app/src/main/java/ai/pai/lensman/session/SessionInteractor.java

@@ -39,7 +39,7 @@ public class SessionInteractor implements Callback{

                     @Override
              

                     public boolean handleMessage(Message message) {
              

                         if(message.what==MSG_CAMERA_INIT_EVENT){
              

                -            int result = CameraJNIInterface.getInstance().mygpcamerainit();
              

                +            int result = CameraJNIInterface.getInstance().java_mygpcamerainit();
              

                             if(result>=0){
              

                                 listener.onSessionStartSuccess(sessionBean.sessionId);
              

                                 isWorking = true;
              

app/src/main/java/ai/pai/lensman/session/SessionPresenter.java

@@ -62,14 +62,13 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter

                                 sessionView.refreshUploadTimeHint();
              

                             }
              

                         },1000,1000);
              

                -        Preferences.getInstance().setCurrentSession(sessionBean.sessionId);
              

                +
              

                     }
              

                 
              

                     @Override
              

                     public void stop() {
              

                         interactor.endSession();
              

                         refreshTimer.cancel();
              

                -        Preferences.getInstance().setCurrentSession("");
              

                         isWorking = false;
              

                         LogHelper.d(TAG,"stop");
              

                     }